changes for new knockout use
Merge branch 'master' into development