Merge "Fix issue #3056500: Problem report for ASTRO" into gingerbread