Merge "Removed odd "partitionsNoPush" setting to simplify the code"