merged from offical