Merge from dualface:devel