Changes from fix2 branch
From feature2
Fixed merge conflict while rebasing feature2 branch
Rebased and resolved conflicts