version 3 release, merge from develop