Prepare for merge with Pjotr