Now including all changes from CA Player app / Norea SE app