Merge "SF: fix redundant assignment operation." into main