b7
b8
b9
Merge batched pull request #35 from barosl/b9

b9

Reviewed-by: barosl
Merge batched pull request #33 from barosl/b7

b7

Reviewed-by: barosl
Merge batched pull request #34 from barosl/b8

b8

Reviewed-by: barosl
b10