Kracoeus 7296

This pull request contains the code for KRACOEUS-7296.
Changed the comment in keeping with our attempts for more professional code comments.