Extending Feature1.
Huge change is Feature1.
Work in progress on Feature2.
Preparation for final version of Feature1.
Feature2 is done.
Merge branch 'master' into Feature2