Merge "Rework release-notes for Oxygen"