Merge "IMS-VT: Fix race condition" into atel.lnx.2.0-dev