Adir Pekarevich

@scottgonzalez Can you please reopen this PR ?

@scottgonzalez Are you ok with @ashensis changes ? Did he address all your comments ? Is anything else needed to allow his code to be merged ?

@arschmitz and @jzaefferer who is in charge to review this PR . @scottgonzales is not answering a long time