Merge w2m into dev-team3