Fix RT#91014
Version 0.17