Manual update to v1.5.0 due to numerous conflict issues.