1.8.7 compatibility plus standalone execution with bootstrapper