Revert "Revert "RF008""

This reverts commit 342aab19d8c02953fa5121060bdbf0dd98539471.