4.5 merge #5