Merge "New normativeType Allotted Resource & Recepies" into release-1.1.0