4.5 merge #2