NOJIRA Merged latest changes from RG