Merge tag 'v5.4.173' into dev-5.4

This is the 5.4.173 stable release

Signed-off-by: Joel Stanley <joel@jms.id.au>