Fluid 4986

Merged in master and modified the IoC expansion in uiBound renderer components.