Merge "Add neon and oxygen jobs for 1cmb"