merge conflict from ptcase-183