Updated files from RHQ source