Added clean up at the beginning of VerifyUserPermissions
Merge remote-tracking branch 'origin/develop' into develop