Merge branch 'release/2021_01_07b2'

1 job for master