Syncing up latest changes from dev to dev-marshal #1562

Job	Run time
Build dockerfile to ensure it works	1m 16s
Build python to ensure it works (3.9)	1m 16s
	2m 32s

Provide feedback