Batch merge

Bulk merge branch merging the following merge requests:

• !165 (closed) with ee98e255
• !22 (closed) with 570b52c5
• !27 (closed) with 848c7533
• !167 (closed) with 206e601d
• !170 (closed) with d563d81b
• !196 (closed) with d06d03c1
• !214 (closed) with c258dfcf
• !216 (closed) with 9b21f8c3
• !205 (closed) with 94660606
• !56 (closed) with ae74d7f2