Merge to master for task procedure#1332

MR: !2 (diffs)