Merge conflict from dancelot