The stupid z-indexing shit finally appears to be fixed.
Resolve merge conflict.