1.0/dev

New Merged items from 1.0/dev-BUG06