Using Smart Annotations (#1675)

June 7, 2018