Merge branch 'master' into documentation-update

Conflicts:
	doc_src/design.hdr
List fixes