PR for commits from mimuw-distributed-systems-group

I hope this PR ends up on JCPP, not on mimuw!