Merge "Clean-up of several small issues"