[#43223567] updated urls and merged to lastest