Fix for redefine keys not working
Merge branch 'develop'