Merge pull request #1005 from MrPetovan/task/8676-ap-multiple-link-image