merge os update 18 with update 16 #3166
Merge pull request #3711 from openscholar/3166-baisong

merge os update 18 with update 16 #3166