--HR-359 changes related to custom data