[MERGE] merged multi-company rules fix from 6.0