Merge "Enforce (not_)secondary_user tagging on *all* CTS Modules"