[KRACOEUS-8420][KRACOEUS-8114][KRACOEUS-8275][KRACOEUS-8424]  Workaround...

... fixes to fix/re-fix these jiras