support bws-1.1RC1 changes