GCC47: Add local modifications