master after bug fix
branch f1 after merge with  the original project