Merge master to beta for testing new HIRE changes and function file update