Initial commit 1.0.X branch