Merge pull request #1420 from timlinux/master

Merge 2.2.0 work into master
Use os.path.join instead string concatenation.
Merge pull request #1437 from ismailsunni/hotfix_2_2

Use os.path.join instead string concatenation.
Merge remote-tracking branch 'aifdr/master' into develop
Merge remote-tracking branch 'aifdr/develop' into develop
Merge pull request #1439 from ismailsunni/develop

Merge hot fix from master