Feature 1 before merge to develop

Feature 1 before merge to develop