10.1 + some private fixes from Vladimir