Merge "Flush update messages for application" into devel/master