Merged from abe-site/master