API patch

#6811