1.15.2

Closed May 23, 2018 100% complete