This covers proper rendering at this point. Issue 3648 Change-Id: I4c22595ca7ed8f5d98034e68b48942e34b5eb6bb