Merge remote-tracking branch 'origin/develop' into develop
mod: error handling for array module