Merge "Avoid a SecurityExcetion crash" into sc-dev