Merge "rework BinaryPushStateChanged atom"