merge development for upcoming revision