main/acf-core: upgrade to 0.18.4

(cherry picked from commit e34aeba347af4f616ecd4c469dac9c275547695a)