4.6.1 merge #1