Merge "Improve blueprint save"