merging CR test from master that apply to CR