Merge changes to develop

changes from oasp/develop merged