everything but without handover algorithm
Merge branch 'dev'