Merge "Fix set rw-core tag to 3.6.4 for Berlin lab deployment"