Pulling changes back to develop

They were supposed to be here. Minor update in cd-3 and setup of cd-4.