Wait for code review branch

Hi I would like to merge this branch in master would you review please