Merge "Add generic CONF skip decorators"