Function was accidently remove
Merge branch 'develop' into release/1.6_RC_2