[rider]: Merge remote-tracking branch 'origin/master' into rider
[rider]: Merge remote-tracking branch 'origin/master' into rider

mallowigi/a-file-icon-idea,mallowigi/a-file-icon-idea,mallowigi/a-file-icon-idea