Opening v.1.17 development. Code optimization