Merge openucb-105 work