Merge "Bug 39496: action=info show non-working magic words"