Please merge "two" into "master"

Please merge "two" into "master", I have made the updates to follow the new pipeline pattern.