Merge branch 'develop' into temp

Resetting the branch to add Clearance