Merge branch 'patch-2021020149-7bwb-aj16' into 'master'

frozen page for 7bwb-aj16

See merge request !61
3 jobs for master in 1 minute and 1 second