merging master into fragmenttest

Reference search