Merged in "dodcerts-on-seperate-slot" branch