Added fix1
Added fix2
cherry picking
merge conflict
fixing up messed up merge