Merging master to coverity_scan for scan