Another fix which was done in a hurry to master :(
Merge branch 'origin/dev'
Back to 2.2.12.