Merge "Fix warning about missing terminating ' character" into main