Merge "Fix access check"