Merge "Resolve pylint `line-too-long` error"