Merged from version 2.1.3