Merge "Adding ability to build from different distribution branches"