Merge "Apex: Explicitly define file paths"