merge fix, and additional bug fixes on Item.__init__
merge fix, and additional bug fixes on Item.__init__

Impactstory/total-impact-core,Impactstory/total-impact-core,Impactstory/total-impact-core,total-impact/total-impact-core,Impactstory/total-impact-core,total-impact/total-impact-core,total-impact/total-impact-core,total-impact/total-impact-core