1.16.18 rvm#1266 git cherry-pick b7f137d rvm#1254 git cherry-pick 268ed3a rvm#1265 git cherry-pick 9391d28 git cherry-pick 21d58df rvm#1293 git cherry-pick 8745bd2