[GAIA BUG935636] - Comments for the new functionalities