Merge pull request #13316 from hoogmin/minor-first Refactor: infinite loop based on Dolphin's style guidelines
