Cherry pick (+1 squashed commits)

Squashed commits:

[e86691a] no message
Merge pull request #4 from vesita/radeva/4-cherrypick

Cherry pick