Merge branch 'main' into LDT-719/integrate-weather-api