Merge "Removing released features" into sc-dev