Merge "Add fallback case to layers_extensions.cpp"