change self::$property to static::$property
Merge pull request #5171 in master
Merge pull request #5155
Merge pull request #5155 in develop