Resolution API improvements
Merge branch 'mbst-9888-resolution-api' into stage