downgraded for compat with Starlet (sigh...)
auto-merge staging into master