fixed array bug
Merge remote-tracking branch 'origin/developer' into feature/application