Fixes during PR review
Merge remote branch 'origin/task/581_v1_contextEntities_attributes_4ops' into task/581_v1_contextEntities_attributes_4ops