Integration of TW-26206 fix