Merge "Make advanced storage option sticky..." into nyc-dev