Merge "Revert "Implementation of new OOM policy"" into devel_3.0_main