ZCLOUD-168 - merge patches for ZCLOUD-104 and ZCLOUD-164 so they don't collide