BUG: layer addition: backporting fixes