Merge "Fix bad pixel out-of-bounds filter" into pi-dev