Add check for correct applicationId format
See merge request !2318 (merged)
(cherry picked from commit aa860d28)
