added changes for 1.8.15