Merging MetaUnion changes into thebeansgroup develop