Merge pull request #3298 from nabinhait/develop

party model patch fix