Co-Authored-By: peppy <pe@ppy.sh>
Co-Authored-By: Llaurence <40535137+Llaurence@users.noreply.github.com>
Closes #3257.
Resolves #2368.