Update to upstream
    
            * Fix errors found by coverity
            * implement default type policy syntax
            * Free allocated memory when clean up / exit.