branch: master after bugfix and ready for release
branch f1 after merging with the changes of bugfix with master branch