Merge remote-tracking branch 'gabithume/146_debug_message'