merged changes for new run control from branch