Merge "Add @deprecated hint to $j"