Fixing "undefined index" error arising from this template
Merge remote-tracking branch 'origin/development' into development