Remo/MJ : Completed #1588 Reverting work on #1246