Merge "VNFRQTS - Modify for initial build"