Merge "Rename Image namespace to File for 'be' locale"