Fix for incorrect feature diffs.
Fixed an issue that caused a test failure.
Merge remote-tracking branch 'origin/pr/550'