Merge branch 'development' into fJava8
Merge branch 'fJava8' into development