GCP-6084, GCP-6085, GCP-6086 (partial)
GCP-6036 fix