move to common / update systemprop