Bug 1038578 - [PR #21873] offline support, originalProps issue, fixed tests