Merge "Revert to version 4.0.0 on oom staging" into staging