Merge "Revert "Add weather clock blueprint"" into main