Merge bootstrap-server commits from boplish20