Fixed merge: a9a33dc4a3752f056214bc6835d10dcb80fc0d39 (some changes have disappeared after merge)