Added @since 3.2