[582609] Workaround platform issue 840
2 files changed