Add changes from smartos.