Merged from BitBucket version