APLANATS-613: guava drop
APLANATS-613: fix (?)
Merge remote-tracking branch 'origin/master'