Add solution to 17.4

Please merge solution 17.4 to trunk