Merge branch 'adapt_pending_predefined_layers' into 'master'

Adapt pending predefined layers

See merge request !21
2 jobs for master in 7 minutes and 44 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Windows
passed #257849
Windows10
masterJobWindows

00:02:12

 
  Linux
passed #257850
masterJobLinux

00:05:31