an old commit on branch 5.6
Merge branch 'maintenance/5.6'