Right comment sign in make file
Resolve conflict after updating branch
Merge branch 'case-3999' into development