Synchronized with latest BP-Schema-tools fixes