Merge from feature_iGetCl_hb done over Master, and removed the dir .idea

JFORTES with functional version of the claim translation

Signed-off-by: Herbert <herberthb12@gmail.com>