SPXD-1 | make gen_deploy
Merge remote-tracking branch 'hoatle/features/1_make_gen_deploy' into develop