Merge changes from topic "OOM-2927"