ExternalProject: Fix commit f098870551d156f233c8637219daeb8e1a372cf4
Merge topic 'ExternalProject-independent-step-targets' into next

237d1da ExternalProject: Fix commit f098870551d156f233c8637219daeb8e1a372cf4