Bug891412

This is a base, through discussion we can change the behaviour as required.