Merge pull request #2271 from nabinhait/coa

party model patch included in patches.txt