Merge changes for v11a branch #17

Closed marcohorstmann closed 1 year ago