Synchronized with bji version