Merge "Change restart Always to always"