CLOUD-302 panel fix