[A21.4] ChangeLog patched, source file patch dropped?!