fixes #723 - merge FB. Support emulation within REST