This is it ! The mega-merge of the JRA_NMBD_REWRITE branch