Updated JC-1388:
-add comments
-refactor context according to CR