KRACOEUS-7398

Committed the code.
These should both be datafields since they are always read-only.