BS-10959, take into consideration the operations at process level
Merge branch 'release-6.3.8' into '6.3.x'