Comment 10 for bug 1838659

@Mingyuan, Are there additional commits required to address this bug? The commits above only used "Partial-Bug".

If additional commits are required, when do you expect to have these proposed/merged?
If no additional commits are required, please add a note and mark the bug as Fix Released. Then please proceed to cherry-pick the changes to r/stx.2.0 and r/stx.3.0 once sufficient testing is done in master.