Merge 1.5.x

Merge changes in 1.5.x branch since 1.5.0 release.