Preparing for merge with Akodiat's branch