Testing Done: Local testing with solution demonstrating the problem.
Issue Number: 1338069
Approved by:
Reviewed by: