Merge 261e8c6 changes made by volaya