[#67863352] added comments