Re: 21.4 and 21.5 compatiblity (missing functions)