Merge "Fix issue #6609383: java.lang.SecurityException: Requires..." into jb-dev