Partial merge with Master

CFiltering and CStimDetector and all related stuff are updated