Updated files from commit 24decda30a774b4d3702ec8fa375bc1ac4b849d7 in hyperion repo