pack of small changes related to auto-inspection of code.
Merge remote-tracking branch 'origin/1.1.8' into 1.1.8