Merging latest changes on main repository