Added comments [MJ-839/MJ-948]