Merging blocking fix to trunk