Set defaults method
PSR and check if default value exists
SP
Merge branch 'refs/heads/2.3/develop' into 3.0/develop