Code changed as per review comments for DEMO-12, DEMO-10, DEMO-11
DEMO-12 re-checked in after fixed as per review comments
dummy check-in for DEMO-12
another check-in linked to DEMO-12