https://github.com/theta42/theta-suite/pull/75