Engine: address PR 3463 comments from unifying to single Organization