#9544: Improvement of application generator