Merge "Added support for docked stack"