Merge branch 'feature/freqWrite/BK-2020-03' into develop