R10 - Update 2

TODO: Update 3
Revert "R10 - Update 2"

This reverts commit 13dda1576552b33c11f7a5ea3ba1f3d18df78767.
Revert "Revert "R10 - Update 2""

This reverts commit f04f4be19547588232242003dcf167ddc5d248a8.