merging master into branch v5.0