Merge branch 'staging' into OCF115-create-table-in-database-for-dynamic-configuration