Added extra check for undefined variables
Merge remote-tracking branch 'origin/develop' into movement-keys