Created by: Leibniz137
Restate pull request #9469 as a single commit. Also added spaces around '*' operator