Fleet migration based on rvalyi work

This pull request adds missing work asked in rvalyi's pull request #10.