merge peStripPropertiesDialog in master