[Hydro] Issue/heavy payload rebased

This PR supersedes #78 
It is rebased to latest hydro-devel, it adresses the comments from @gavanderhoorn and has some beautifying changes guaranteeing conformity