Fix for commit 'Temporary remove incomplete featureset'