Merge "Fix expression deprecated warning on ${version}"