This v3 patch series tries to address new license change properly. I just did an incremental build to test compiling without actual test in previous submissions, assuming the license change in V3 irrelevant with these further steps.