Merged development into trunk for release v1.5402