Preparation of commit for feature #13134