Merge "Add new config to combine unavailable and unknown option"