Working branch

Done: WORKING_BRANCH is up-to-date (merged with upstream master).
Please review and merge!
Thanks!