Moving to compatibility_update branch of oti