Resolve "Fix lints in master"

Closed username-removed-619072 requested to merge 1402-fix-lints-in-master into master
Edited by username-removed-619072