Merge "SecuritySettings test" into tm-qpr-dev