Import module changes from upstream.