Added changes from upstream 1.0.0.48
added changes from upstream 1.0.0.48
added changes from upstream 1.0.0.48