Merge "Do not call 'setEnabled' before mapper is configured"