#JC-1251 Added data binding for link edition.
Merge remote-tracking branch 'origin/develop' into develop