Merge "Fixing securityException issue" into nyc-dev