[#KOD-338] Fix for possible github timeouts on merge