UP-4212 Added comments