Related to #1409 (closed) and #1395
No changes between JohannesPfeifer:filter_initial_state and master