Merge 1.0 Usability into 1.0 release