Revert "Merge branch 'mrf-silence-2' into 'develop'"