Patch 39 for forj cli

Change-Id: I3ae3b8d0bcf3ed4b8e7ff9203326a291ec2a514b