baseline 5.6.17 code