sync with current 7 branch as there were some changes comitted to the branch and not to master by mistake