Merge "Fix SDC view"