Support #3650
Merge branch 'support_3650'