SCAL-265 - Fixed private resources infrastructures
Merge remote-tracking branch 'origin/master'