4.6.2 merge #1
4.6.2 merge #2