CLOUD-216 fixed layout