Rhns snapshot work merge