#132: disabled the feature, ready to merge