Import of Version 1.12.1