terms

Change-Id: Ic2461aa998b454fe7d007df21438b240d7bd2767
Merge branch 'develop' into staging
Merge branch 'staging'