This will include bug fix https://issues.openmrs.org/browse/HTML-772
@dev3, @dev4, @dev5
UPDATE: Successfully done.
Works for me, thanks @willa !