Squash of commits from CM gerrit
... I've seen to be useful..