[ issue 1226 ] Fixed refine.
Merge branch 'maint-2.4.0'