From master: IMA Demo prep.