Merge of the debugging feature branch