merge up-to-date master to jimahn/master_invix_internal_renaming