resolves MCKIN-2094, MCKIN-2078