nbc#757132 and bnc#777449 puzzle string

Please review and check in.