squash merge of the feature/apt-binary branch without the changes from experimental