Comment 14 for bug 1621340

Sorry Hua for the Delay, TL;DR waiting for merge review.

I just discussed last week with my peers, we agreed that if nothing happens I'll upload as-is soon.