Merge "Fix the removal of config.skip_(unless|if)_config decorators"