Merge "Fix installation failure due to unexpected dbpath under CLI installation"