Fix: CLOUD-153; Fix: CLOUD-151.