Revert array_replace_recursive because of existing packages.
Merge branch '4.2'