changes from cord-poa branch (v0.7.4) #19

Closed amarts closed 2 years ago