Merge changes from topic "OOM-1810"