Merge branch 'hotfix/cumulative' into hotfix/replace_image_settings
using help variable to set image_id

Change-Id: Ifaabcc0ed1d94e7cc7c0854d4bd220bc106e3f25
Merge branch 'hotfix/replace_image_settings' into hotfix/cumulative