cel-d-15 #1678