Merge "rubbos instance workflow improvement"