Merge "cumilative patch from commit 795075444" into main