This is commit from Uros
This is resolve from merge conflicts