Committed
Merge branch 'merge1and2'