Add option to set container's default to empty container

Add option to set container's default to empty container #1617