$packge is array Closes #4725
Merge remote-tracking branch 'upstream/master' into upstream-master