MergeFix#6