FAB-12730 #done

Change-Id: Ief7b85827ba950a27d4b4240a5b276072e524b40
Signed-off-by: Artem Barger <bartem@il.ibm.com>