After commit run on top level trans master

related to #16432 .

This is practically a backport of that fix, plus 1 commit to make it work.

This is to ensure the same behaviour as 3.2