merge os update 18 with update 16 #3166

#3166