Merged upstream into racker fixes