4.5.1 merge #6