4.6.2 merge #2