Merge from vendor branch OPENPAM: