Merge "Fixed a bug where the outline was not correctly updated"