Merge change that allows skipping of ~ on serial console