LDC-572 Hotfix feature