Merge from judf

Merge from judf