merge devel branch to master branch (release 0.36.0 prep) #319

Closed dozy closed 1 year ago