This implements a super feature.
Merge branch 'feature' into dev