1.5.x store manager improvements

backport including deprecations