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