More merges from new JB Source, added support for new base