Re: [AC 21.5] Fix merge and font-lock problems