Engine: engine-users - fixes #3331