Changes for 117 release