Commented out validations
merge master