Merge commit #2a32006dd53d089ce504a46b552d538583664993 from main repo - fix doubled logging