Merge "Minor changes proposed by Tomas Kukral"