Lack of information problem corrected.
Merge branch 'master' into feature1