Merge 1.5 release changes into develop