Use HUNTER_SKIP_LOCK variable for internal building
Merge branch 'update' into update.linux