Revision 1.0
Merge branch 'master' into V3.0