APLANATS-619: vacations fix
Merge remote-tracking branch 'origin/master'
APLANATS-644