b1
b2
b1-2
b2-2
b2-3
Merge batched pull request #24 from barosl/b1

b1

Reviewed-by: barosl
Merge batched pull request #25 from barosl/b2

b2

Reviewed-by: barosl