Merge branch 'vendor/OPENPAM'