Merge pull request #646 from naumenkogs/2020-06-router-mpp