merged from the jackyf-devel branch