made no size adjustment to default, locked size is terrible
Merge remote-tracking branch 'origin/master' into acca_dev