Merge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop'