Draft: Implemented suggested changes from [#3208818], [#3213595], [#3221074], [#3294481] combined for testing
Closes #3272784