Merge "Fix for maintaining properties for non-default container. Signed-off-by:...