#29799 - hql cast fixed
Merge branch '#29799#Targetprocess_Company_dashboard' into dev