[TAC-118] 1.9.8-SNAPSHOT to 1.9.7