Fix: name tag
Fix: wrong merge from release-0.2