Merge "Fix a possibility to overcome BLOCK permission" into stable-2.9