WP-4518 Changes related to using filefield_paths module