merged form 10.12.14 Cocovila version