Merge "Fix NoExecutePermissionTest" into lmp-dev