Sync with latest fixes in BP-Schema-tools