Issue #3415665 by joshua1234511: Utilize Focal Point module