3.0 - Fix join docblocks