more changes in feature cool3
Merge commit 'd5557cc8c5c2bdf24e99af2f5afe5da834bea695' into HEAD