Solution for 11053 and fixed unused typedef in 10832