DO NOT PULL, Only for unit tests Feature/zen 12741