Merge branch 'DDBEASY-223' into develop
Merge branch 'DDBEASY-223' into develop
DDBEASY 223 - History back null item id fix.