Merge "fix patch 10"