Successful testing over 3 months and 2 version, move to community. (cherry picked from commit 0b40d7ad)