Revert 0ed0376..39b9273

This rolls back to commit 0ed03763c004ef952db0b1cf26b5510fc79728e6.
Merge branch 'uidev'
Revert "Revert 0ed0376..39b9273"

This reverts commit 59534ef007384bf32524c823655eedcfbf65de24.
fixed a typo
Merge branch 'master' into uidev