Due to the merge of ds branch we need to catch up field changes