Updating develop with latest changes from release/4.2.