Implement changes to orchestral/foundation@81aed55 and orchestral/support@978cc2a

Signed-off-by: crynobone <crynobone@gmail.com>