Merge "Minor fixes to clean" into stable/euphrates