Merge ubc-3

Signed-off-by: Alec Ari <neotheuser@ymail.com>