Kracoeus 7296

This pull request contains the code for KRACOEUS-7296.
This code was put in just to get through validation.  It is part of a larger issue, KRACOEUS-7635.