Enhance support of incrementable feedback and add appropriate tests