Merge "Switch cast over to support library dialog" into oc-dev