Merge "Add streamlined workflow to patch screen"