Master faster weblinkback

Includes some commits from rebase to latest master