Merge fixes for Issue #48