* commit '6824c135fe9639c74f38f125d678c20065c3347c': DO NOT MERGE. Integrate fragment work from master