Support HB 4020

Support HB 4020