Changed name to resolve temporary the problem with history.js
Merge branch 'APD-191-IMR' into develop