MAVERICK X3 / X3 X-DS, 2016 to 2018