LPS-32405 Refactor Buffered Increment infrastructure to improve performance and to be more flexible to complex real scenarios
LPS-32405 Apply
LPS-32405 Source formatting
LPS-31315 Remove unused var