Fix for history api set_as_current().
Fix for history api set_as_current().
Merge stable