[BUG #8471] Added proper apply, event and init value handling