fix for A and B is done

Signed-off-by: Dimitar Todorov <d.todorov@seeburger.com>
committing conflict

Signed-off-by: Dimitar Todorov <d.todorov@seeburger.com>
bah maamu
Signed-off-by: Dimitar Todorov <d.todorov@seeburger.com>