Merge pull request #39 from av-mido/stable/grizzly

Porting MN-251 to grizzly.