Merge branch 'hotfix/base-inspectlet'
Merge remote-tracking branch 'origin/master' into develop