Merge "OOM companion changes to topic.properties removal" into staging