4.12.x support for bootstrap client
4.12.x support for bootstrap client