Merge "Maybe fix issue #12957738: SecurityException in..."