Fixed some issues with building the "7.1" branch#2

dretez wants to merge 2 commits into

UselessSolutions:7.1UselessSolutions/DragonFlyExample:7.1from

dretez:7.1dretez/DragonFlyExample:7.1Copy head branch name to clipboard