Merge "fix(invalid-access): fix the build failures"