Merge branch 'main' into basop-2566-harmonize-getenergycldfb