7.24 core update

Signed-off-by: Gordon Makely <gmakely@duoconsulting.com>