Merging into master for v10.2.4 release