am a6892270: Merge "Clean up mod union table"

* commit 'a68922706fb5ee79e92723f18420edfd8650a3c6':
  Clean up mod union table