Merge "Re-factor Quick ABI support"