Merge commit and work towards 5.2.4