Re: #1257 api comptinility changes