[fixed] better handling of resource stacking during sampling Mantis
#3736

Change-Id: Ic32b5c4e190510ccaa3dc1d4110a4d03a8c72f86
Merge "[fixed] better handling of resource stacking during sampling Mantis #3736" into unstable