Fix 2 phases execution_policy

Created by: Sebastien GOYON

Imported comments:

By Sebastien GOYON on 2021-05-10T10:47:10.278Z

mentioned in commit d7a336e1

By Sebastien GOYON on 2021-05-10T10:46:28.027Z

assigned to @shinedday

By Sebastien GOYON on 2021-05-10T10:41:27.994Z

mentioned in merge request !9

By Sebastien GOYON on 2021-05-10T10:39:37.907Z

mentioned in merge request !8

By Sebastien GOYON on 2021-05-10T10:39:37.797Z

created merge request !8 to address this issue

By Sebastien GOYON on 2021-05-10T10:38:20.889Z

created branch 22-fix-2-phases-execution_policy to address this issue