Issue #3467405 by quietone, smustgrave: Missing @var annotation for properties that provide default values (cherry picked from commit a7180bf1)