get rid of unncessary "mainline" stuff
fixed merge conflict in #process_inclusion
comment and whitespace only
Merge branch 'mainhandle' into formatclean
fixed standard (packed) image updating
Merge branch 'formatclean' into develop
compacted item_ids