Merge branch 'ready/chrysn/linkmapenhancement'