manually re-added changes to WPEC master