Support BA231673

Support BA231673