merge BPC-266 to develop branch fix