Merge "Fixed bug where stack crop wasn't applied when it should"