Merge recent changes from the master branch into element_parser branch