merging enc-static.git into enc-live.git