MODE-1820: Initial implementation

Fixed original PR