Refer to container.state.history instead of container.history -- See #2389
Merge branch 'michel_2389_history' into next