Revert "Revert "RF001""

This reverts commit 6d7fb872678a6ab1ca801f0effc77b76f09ce31b.