catchup of all previous extensions changes
Merge branch 'release'