Merge latest changes into coverity test branch