[PLUS-926]: final improvements