Merge to master for task procedure#1328

Need to change some smoke tests.