Bugfixes: The ambiguity resolution did not work due to two bugs introduced during the Thymeleaf migration