Refresh from upstream
patches to support Mer g++