Fix for bug 907683 - Reloading from primary

[test] and [merge]