QA testing, added missing properties for progressive enhancement
fixing conflicts
Merged develop