Ported changes in installation, scripts, cli and related.