Squashed merge of particleInteractions up to commit e7cb5bcf0315c359539ef1e715e1d51991343391
ccfb6e32a6