Merge "Work on issue #10759595: preferred tag doesn't prevent..." into klp-dev