Updates since 1.5.0.3 merge