Update commit e58c2282 in order to take advantage of new functions and variables available in version 17.02. bug 3516