Merge and started new 1.0.5 dev branch