INTEXT-60 Incorporated Review comments
Merge remote-tracking branch 'origin/INTEXT-60' into INTEXT-60