support using of indicator_buffers as a field
Merge remote-tracking branch 'origin/master'