Check separately, the order can change.
Merge pull request #7066 from s0undt3ch/0.16-merge

Check separately, the order can change.