Merged in master. Keeping open for now as I would like to fix the 5.4.0.CR1 release issue before pushing commits to the 5.4 branch.