Checkout from master (source changes only)

As mentioned in the comment, here are the source changes. Looking forward to your feedback!