merge the new modify by pycommon