Merge "Extract getSupplementaryFile out of VFM controller"