Updated JC-1388:
-for review