Merging from internal release 2.1.194