4.5 merge #6