Kracoeus 7296

This pull request contains the code for KRACOEUS-7296.
please remove commented out code.