Fix quoting and unquoting of primitive strings (#1109) for 8.29 (#1110)

Fix quoting and unquoting of primitive strings (#1109) for 8.29 (#1110) #2872