Push to v1.5

Performance related shutdown implemented