Features/Issues addressed in 2017.4