Revert "Revert "bp/123456""

This reverts commit e3146e63702cc1726b86e56bc1957d058ae0abac.