Manual merge for bag Size fix

Manual merge due to odd merge conflict i could not figure out. Closing
branch soon.