[openFATE 317762] New SCM tree handling