step 8: f4 - added aa to b
step 7: f4 - added aa to a
Merge branch 'feature/f4' into develop