Merge branch 'rm-trasaction-fix-13166'

Conflicts:
	activerecord/CHANGELOG.md

Backport of #13166