merged in 569944efe9df65ba2704c524c29a145f722632d2