Merge "Replaces hardcoded volume size by configured value"