Introduce doHistory parameter to stateManager
Merge branch 'APD-763-BOZ' into develop