Merge "Adding app version display" into stable/euphrates