use same algoritm twice

Reinder Kraaijrequested to merge
SDC-1400-Front-End-Only into master

Moves code away for SDC-1400 to generic library

Merge request reports