4.15 merge window fixes 1