[TIDOC-1789] Fix platform support