Merge branch 'fix/privacy-notification' into 'develop'