Contains latest changes from dev branch, fixes for contrib section