TO_BE_ENABLED_LATER count: 128. Closes #410
Merge branch 'master' into algoLayer