This resolves b and blah blah blah

Youtrack: #rabbit-61 Finished tag to be tested