Merge changes to release 1.5.4