Merge "Add helper trait for deprecating properties"