Integrate neard post 0.6 changes - handover code