Hopefully fixed merge conflicts [MJ-405]