Moved changes to 11.2.3