Improved initial phase
Merge branch 'dev-hen' into dev