Committing both core and ui