Merged logicui into master