Merge "Support Widget Application" into devel/master