Merged back to upstream

R.T.