Issue #1545 - override buffer-size parameter at layer level - revised