actually commit this change that was supposed to be commited in v3.9.8
Merge remote-tracking branch 'origin/development' into bleeding-edge