Merge "BUG-8: mark deprecated classes as such"