Start of rewriting configbased verification due hanging build process in old method.
Merge remote-tracking branch 'origin/master'