CM# merge feature/dynamicAttributesMFR into dev