Engine: engine-users - fixes #3331
Merge pull request #3254 from thomasmckay/engine-users

Engine: engine-users - refers #3331