Support AB 1448 and AB 1223

Support AB 1448 and AB 1223