License version has been added.
Merge remote-tracking branch 'upstream/develop' into nonstatic