bb-1413, bb-1207 #resolve