integrate changes for fixing the runtimes feature (still not fully working - partial fix only)