Merge "Use TCM context if application context is unavailble." into pi-dev