Merge branch 'staging' into OCF112-security-psk-method-authentication-and-authorization