A.97. Release 3.6.21

Release Date: 2020-05-21

A.97.1. Bug fixes