TW-34816 api change related