merging rezn8d changes