Merge "FP5-2442 Generic and Operator require strings re-architecture" into t6490_fp5_qssi_dev