PR against the last commit to remove live swap into commit of its own