Bug ZK-2488: Caption component with label renders incorrectly
Merge remote-tracking branch 'Chunfu/B70-ZK-2488'