Merge "Fix bugs in cast QS tile" into oc-dev