Merged from UBER-KK