- Fixing NPE @ LinkingInterface
Merge remote-tracking branch 'origin/master'