merge from GTM-10