Fix for UIkit events that were refactored
Merge branch 'master' into shop