Merge "fix patch 9"