In the final state of this feature, a rebase on Master was executed. In resolving...