[SP-903] - backport of MONDRIAN-1819 - cherry-picked from 180f83aace4d02861ea8e2b552209472269a364a
Merge pull request #233 from kurtwalker/SP-903

[SP-903] - backport of MONDRIAN-1819 - cherry-picked from 180f83aace4d02...