case 4018 - WAYF hooks implementation.
case 4018 - Integrate with Ding UCFMD implementation.
Merge branch 'case-4018' into develop