Finish pushing CLD-695 and CLD-696 fixes to staging