Manual merge of Nitriques integration branch fixes