Merge "Adjust stable jobs per maintenance transitions"