Merge "Fix issue with push in reordering (bug: 6259603)"