Adds changes from !13 (merged) and resolves merge conflicts from the master branch.
Closes !13 (merged).