Make extract not deleted static
Merge branch 'dev-v2.4'