Update from mk1 source drop