Changes for version 2.07 - 2017-08-17