Removed visibility constraints.
Solved merge conflicts.