Sync with latest fix in BP-Schema-tools