Merge pull request #989 from MrPetovan/task/move-share-header