Fix @since annotations
Merge branch '4.3'