merge feature/jd_polystrips_pressure into feature/jd_polystrips