Refactoring to more readable variant.
Refactoring.
Merge remote-tracking branch 'origin/3.0-master' into 3.0-master