Merge "OOF Policy Config File Creation Issue"