Added extra checks and security to reset functionality
Merge branch 'isoda' into isoda-final