fixes #16199 - always run build related callbacks
(cherry picked from commit 31ddd916c745db7a6eb07f989706e8ed7dd3f98f)
fixes #16199 - always run build related callbacks
(cherry picked from commit 31ddd916c745db7a6eb07f989706e8ed7dd3f98f)