Merge "Add support for Bottlenecks' new framework and potential installers"