fix outdated comments
Merge branch 'master' into MANTA-17