#2523 - Added square as a package unit