CON-751: Added comments