case 3616 - Adaptations.
case 3616 - Correct file permissions.
case 3616 - After CR fixes.
case 3616 - Another set of CR fixes.
Merge branch 'case-3616' into develop