merged from development and other revisions