Pr2081 review 2

Separate PR to allow fast travis testing