Merge "Mark Javelin as deprecated"