Do not lock the candidate config when using --check
Merge branch 'check_feature' into dyn