code enhancement related to WF-1604, WF-1602