manually merged version-4.11 to version-12 (took all changes from
version-4.11. not taking care of other changes committed to master)