add all changes from format_code branch into master