Re: #1589 - added mock server