Merge "Update Neon release to Neon-SR1" into stable/neon