Updated 2.0-stable Omnibus with metadata fix