Merge "Fix proper line removal and remove printf string in replacement line" into stacklight