Merge "RESTRICT AUTOMERGE Added limitations for attributions to handle invalid cases" into tm-dev