Merge changes from release 1.5.14