Updating #2251 by merging commits