Merge branch 'tg/next/1.0_new_install_dir' into tg/next/1.0