Updated upstream.
Merge branch 'release/0.2.47-2'