Merge "Add basic test coverage for sysystemfeatures-gen args" into main