Change Details

PLEASE DO NOT REVIEW, will update this diff when I get the final green light for the UI.

PLEASE DO NOT REVIEW, will update this diff when I get the final green light for the UI. Depends on D8819