[DEP-16] Added comments handling