Revert "Merge branch 'DEV' into F1"

This reverts commit f7db0a39dedabba471776115fd95598d47481c7c, reversing
changes made to bb038989d12833f61e85f4ea751c9ce0f4b7b0e7.
Revert "Revert "Merge branch 'DEV' into F1""

This reverts commit 8cb1566a0067e583f0127a29af96f5cc8970b782.