[GAIA BUG935636] - Comments for the new functionalities
Merge pull request #299 from michalbe/Bug935636-temp

[GAIA BUG935636] - Comments for the new functionalities