CORE-4446: implemented at least part of the stub code