merged MWEB-916 manually and fixed conflicts