Merged from branch dev-2.1-light