Utils: Attempt at closing memory leak on bath compare
Simplified container click demo.
Modal sample minor fix
Various fixes after regression testing
Merge remote-tracking branch 'upstream/master'