[TIMOB-14978] Fixed the order of actions that was causing incremental build errors.