Merge "Reporting docker deployment improvement"