v0.67 protected

Wouter Beugeling

@wbeugeling

fdc8c6a7 · Merge develop to master · Jun 24, 2021

Various minor improvements