Contains changes from #3488394 as well to prevent conflicts. DO NOT MERGE UNTIL THAT IS MERGED ALSO.
Closes #3488891