Merge branch 'np/maint-1.6.3-deepen'