Merge "fix the difference of DefaultLayer and Layer" into devel/master