[Dev] Added a mapping between the customer choice enum values and the prototypes implementing the corresponding algorithms.
Merge branch 'trunk' into releases