removed merge notes MJ-394