Merge tag '0.2.61' into develop

Release v0.2.61
Restored missing merge code
removed tmp
Preparation of release/0.2.62
Merge branch 'release/0.2.62'