4.6.0 merge #1