Update changes to orchestral/support@d2a1356 and orchestral/support@23774d9

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