FIX #17700 TIME 0:15 copy from branch develop and test