Merge branch 'fix/oxygen' into for-linus