Merge 1.4 into 1.5

Not ready for review, will push through CI first.