pull 5.4 changes into 5.5

David Gilbert requested to merge dev/5.4 into dev/5.5 Jan 30, 2025