Revert "Revert to v1.5-rc5 due to build error on Mac"

This reverts commit aef67a5bb2873165a501361d5312f2ba4340cdd2.