Bug fixes for:
GCL1-10967
GCL1-10990