preparation to merge MT version