Merging commits sent directly to release24 back into master