Fixed bad uibkey delete.
Merge branch 'test' into dev