test manifest
Merge commit '35479b0c4dc1ac86522c4f1b4258c0b2940a1269'