LegacyBundle entities
Merge branch 'develop' into lord_baine