[Github] Pull Request #12851 (techaddict)
[Github] Pull Request #13063 (techaddict)
[Github] Pull Request #13069 (yhuai)