fix Guard
Merge remote-tracking branch 'origin/DF-598_get_dpi' into DF-598_get_dpi