KRACOEUS-7113

Took Neethu's original work and fixed it up based on Rice fixes and added KRAD Spring reference for when Rice fully supports that.