Merge "Fix for issues after container restart"