#FEC-1397 #comment fixed promptLinkText typo (removed space from name)
Merge remote-tracking branch 'origin/2.9-May-18' into 2.9-May-18