Merge "Avoid checking write access if not necessary"