Based on PR#45807 by Patrick Welche, and clean up dependency. improve application supports, bug fixes, and translation updates.