code comments added for DO-6067 and CORE-2198 stories.