Merge "Fix clearing linkproperties on disconnect" into jb-mr2-dev