Commenting bug fixed
Merge remote-tracking branch 'origin/Migrating-sorts' into reporting