Import of Version 1.11.1