support bws-1.1RC3 changes