Merge "Add @var to class properties to clarify types"